aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
authortony baldwin <tonybaldwin@gmx.com>2012-03-21 01:36:23 -0400
committertony baldwin <tonybaldwin@gmx.com>2012-03-21 01:36:23 -0400
commite5c29fcc786cee73c08247824cb87e9ed65a2c36 (patch)
tree1e5a6fcf5ba20e5effdd60e6d6ffa5fadb11d9d7 /view/theme/dispy
parentcf17606d0f6200296b1e6d67f9ae3fb797e0df69 (diff)
parentb4a2dae0850ed72b61b008e44efa98f300ccd640 (diff)
downloadvolse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.gz
volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.bz2
volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy')
-rw-r--r--view/theme/dispy/contact_template.tpl2
-rw-r--r--view/theme/dispy/group_side.tpl6
-rw-r--r--view/theme/dispy/head.tpl19
-rw-r--r--view/theme/dispy/jot-header.tpl14
-rw-r--r--view/theme/dispy/nav.tpl16
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/nets.tpl2
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/photo_view.tpl15
-rw-r--r--view/theme/dispy/profile_vcard.tpl30
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/saved_searches_aside.tpl2
-rw-r--r--view/theme/dispy/style.css368
-rw-r--r--view/theme/dispy/theme.php57
-rw-r--r--view/theme/dispy/wall_item.tpl5
-rw-r--r--view/theme/dispy/wallwall_item.tpl7
13 files changed, 372 insertions, 171 deletions
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index fbf354b47..04968bd07 100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -20,9 +20,11 @@
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
<div class="contact-entry-end" ></div>
</div>
+
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
index 516d70d5b..10ecec2e8 100644
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -1,5 +1,5 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
@@ -9,7 +9,7 @@
{{ if $group.edit }}
<a
class="groupsideedit"
- href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+ href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
{{ endif }}
{{ if $group.cid }}
<input type="checkbox"
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index 793af6fd2..f606f2f7e 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -74,25 +74,6 @@
}
}
- $(document).ready(function() {
- function toggleToolbar() {
- if ( $('#nav-floater').is(':visible') ) {
- $('#nav-floater').slideUp('fast');
- $('.floaterflip').css({
- backgroundPosition: '-210px -60px'
- });
- } else {
- $('#nav-floater').slideDown('fast');
- $('.floaterflip').css({
- backgroundPosition: '-190px -60px'
- });
- }
- };
- $('.floaterflip').click(function() {
- toggleToolbar();
- return false;
- });
- });
</script>
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 43dcdbb84..4c8f59d79 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -114,6 +114,7 @@ function enableOnUser(){
$(this).val("");
initEditor();
}
+
</script>
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
<script type="text/javascript">
@@ -121,6 +122,7 @@ function enableOnUser(){
var addtitle = '$addtitle';
$(document).ready(function() {
+
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@@ -261,6 +263,18 @@ 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;
+ }
+ }
+
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index f6e399ef5..11469dc66 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -57,14 +57,6 @@ works -->
</li>
{{ endif }}
-{{ if $userinfo }}
- <ul id="nav-user-menu" class="menu-popup">
- {{ for $nav.usermenu as $usermenu }}
- <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
- {{ endfor }}
- </ul>
-{{ 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 }}
@@ -94,6 +86,14 @@ works -->
</ul>
</div>
+{{ if $userinfo }}
+ <ul id="nav-user-menu" class="menu-popup">
+ {{ for $nav.usermenu as $usermenu }}
+ <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+ {{ endfor }}
+ </ul>
+{{ endif }}
+
<div id="notifications">
{{ if $nav.home }}
<a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl
index b0cb8890c..b322717ad 100755..100644
--- a/view/theme/dispy/nets.tpl
+++ b/view/theme/dispy/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?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li><a href="$base?f=&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/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index 4582751c6..732caf690 100755..100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -4,20 +4,17 @@
<div id="photo-edit-link-wrap">
{{ if $tools }}
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
+|
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
- {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
- <a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
- {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
</div>
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
+<div id="photo-caption">$desc</div>
{{ if $tags }}
<div id="in-this-photo-text">$tags.0</div>
<div id="in-this-photo">$tags.1</div>
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index 0c289d982..350a6ce4a 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -1,12 +1,29 @@
<div class="vcard">
+ {{ if $profile.edit }}
+ <div class="action">
+ <span class="icon-profile-edit"></span>
+ <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+ <ul id="profiles-menu" class="menu-popup">
+ {{ for $profile.menu.entries as $e }}
+ <li>
+ <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="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+
+ </ul>
+ </div>
+ {{ endif }}
+
<div class="fn label">$profile.name</div>
-
+
{{ if $pdesc }}
<div class="title">$profile.pdesc</div>
{{ endif }}
<div id="profile-photo-wrapper">
- <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
+ <img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
</div>
{{ if $location }}
@@ -15,10 +32,11 @@
<div class="adr">
{{ if $profile.address }}
<div class="street-address">$profile.address</div>{{ endif }}
- <span class="city-state-zip">$profile.zip</span>
- <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
- <span class="region">$profile.region</span>
- <span class="postal-code">$profile.postal-code</span>
+ <span class="city-state-zip">
+ <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+ <span class="region">$profile.region</span>
+ <span class="postal-code">$profile.postal-code</span>
+ </span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
</div>
</div>
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
index e2aae1e77..63a85dda5 100755..100644
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ b/view/theme/dispy/saved_searches_aside.tpl
@@ -1,4 +1,4 @@
-<div class="widget" id="saved-search-list">
+<div id="saved-search-list" class="widget">
<h3 id="search">$title</h3>
$searchbox
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 24fa39f77..6547cf986 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -48,7 +48,7 @@ body {
body, button, input, select, textarea {
font-family: sans-serif;
color: #222;
- background-color: rgb(254,254,254);
+ background-color: #efefef;
}
select {
border: 1px #555 dotted;
@@ -152,10 +152,11 @@ a:hover {
color: #729fcf;
}
input[type=submit] {
+ background-color: #555753;
+ color: #eeeeec;
+ font-weight: bold;
margin-top: 10px;
height: 22px;
- background-color: #555753;
- color: #eeeeec;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@@ -190,14 +191,16 @@ input[type=submit] {
color: #fff;
}
+
/**
* global
*/
/* .tool .action */
.action {
- float: right;
+ margin: 5px 0;
}
+
/**
* login
*/
@@ -205,9 +208,10 @@ input[type=submit] {
margin-right: 20px;
}
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
nav {
height: 60px;
display: block;
@@ -515,11 +519,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
position: fixed;
left: 28px;
bottom: 6px;
+ z-index: 10;
}
#language-selector {
position: fixed;
bottom: 2px;
left: 52px;
+ z-index: 10;
}
.menu-popup {
position: absolute;
@@ -532,9 +538,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+ box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
}
.menu-popup a {
display: block;
@@ -582,24 +588,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/** sysmsg **/
#sysmsg_info {
- position:fixed;
- bottom:0;
- -moz-box-shadow:0 0 5px #888;
- -webkit-box-shadow:0 0 5px #888;
- box-shadow:0 0 5px #888;
+ position: fixed;
+ bottom: 0;
+ -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+ -webkit-box-shadow: 3px 3px 10px 0 #000;
+ box-shadow: 3px 3px 10px 0 #000;
padding: 10px;
- background-color:#fcaf3e;
+ background-color: #fcaf3e;
border:2px solid #f8911b;
- border-bottom:0;
+ border-bottom: 0;
padding-bottom: 50px;
z-index: 1000;
}
#sysmsg {
position: fixed;
bottom: 0;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
+ -moz-box-shadow: 3px 3px 10px 0 #000;
+ -webkit-box-shadow: 3px 3px 10px 0 #000;
+ box-shadow: 3px 3px 10px 0 #000;
padding: 10px;
background-color: #fcaf3e;
border: 2px solid #f8911b;
@@ -683,7 +689,9 @@ aside #viewcontacts {
#netsearch-box {
margin: 30px 0px;
}
-
+.ttright {
+ margin: 0px 0px 0px 0px;
+}
/**
* contacts block
@@ -766,6 +774,15 @@ aside #viewcontacts {
#profile-jot-text_ifr {
width:99.900002% !important;
}
+[id$="jot-text_ifr"] {
+ width: 99.900002% !important;
+ color: #2e2f2e;
+ background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+ color: #2e2f2e;
+ background: #eec;
+}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@@ -805,6 +822,9 @@ aside #viewcontacts {
border-bottom: 0;
padding: 5px;
}
+#profile-jot-net {
+ margin: 5px 0;
+}
#jot-preview-link {
margin: 0 0 0 10px;
border: 0;
@@ -820,18 +840,19 @@ aside #viewcontacts {
border: 0;
text-decoration: none;
float: right;
+ cursor: pointer;
}
#profile-jot-perms {
float: right;
background-color: #555753;
height: 22px;
width: 20px;
- -webkit-border-radius: 5px 0px 0px 5px;
- -moz-border-radius: 5px 0px 0px 5px;
- border-radius: 5px 0px 0px 5px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
overflow: hidden;
border: 0px;
- margin: 0 -4px 0 10px;
+ margin: 0 10px 0 10px;
}
#profile-jot-plugin-wrapper {
width: 1px;
@@ -849,23 +870,21 @@ aside #viewcontacts {
height: 22px;
background-color: #555753;
color: #eeeeec;
- -webkit-border-radius: 0 5px 5px 0;
- -moz-border-radius: 0 5px 5px 0;
- border-radius: 0 5px 5px 0;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
border: 0;
margin: 0;
float: right;
}
-#jot-perms-icons {
- background-color: #555753;
+#jot-perms-icon {
height: 22px;
width: 20px;
- -webkit-border-radius: 0 5px 5px 0;
- -moz-border-radius: 0 5px 5px 0;
- border-radius: 0 5px 5px 0;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
overflow: hidden;
border: 0;
- margin: 0 0 0 94.4%;
}
#profile-jot-acl-wrapper {
margin: 0 10px;
@@ -908,10 +927,11 @@ aside #viewcontacts {
clear: both;
}
#jot-title-desc {
- color: #cccccc;
+ color: #ccc;
}
#profile-jot-desc {
color: #a00;
+ margin: 5px 0;
}
#jot-title-wrapper {
margin-bottom: 5px;
@@ -1088,7 +1108,7 @@ section {
clear: left;
font-size: 0.8em;
color: #878883;
- margin: 20px 0 0 110px;
+ margin: 20px 20px 0 110px;
}
.wall-item-ago {
display: inline;
@@ -1237,7 +1257,7 @@ section {
}
[class^="comment-edit-text"] {
margin: 5px 0 10px 20px;
- width: 86.5%;
+ width: 84.5%;
}
.comment-edit-text-empty {
height: 20px;
@@ -1325,10 +1345,11 @@ div[id$="wrapper"] br {
.photo-album-image-wrapper,
.photo-top-image-wrapper {
float: left;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
+ -moz-box-shadow: 3px 3px 10px 0 #000;
+ -webkit-box-shadow: 3px 3px 10px 0 #000;
+ box-shadow: 3px 3px 10px 0 #000;
background-color: #eee;
+ color: #111;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@@ -1474,6 +1495,8 @@ div[id$="wrapper"] br {
}
#prvmail-subject {
width: 100%;
+ color: #eec;
+ background: #444;
}
#prvmail-submit-wrapper {
margin-top: 10px;
@@ -1497,20 +1520,25 @@ div[id$="wrapper"] br {
}
.mail-list-sender-name {
display: inline;
+ font-size: 1.1em;
}
.mail-list-date {
display: inline;
- font-size: 0.8em;
+ font-size: 0.9em;
padding-left: 10px;
}
+.mail-list-sender-name, .mail-list-date {
+ font-style: italic;
+}
.mail-list-subject {
- font-size: 1.5em;
+ font-size: 1.2em;
}
.mail-list-delete-wrapper {
float: right;
}
.mail-list-outside-wrapper-end {
clear: both;
+ border-bottom: 1px #eec dotted;
}
.mail-conv-sender {
float: left;
@@ -1681,7 +1709,6 @@ div[id$="wrapper"] br {
}
-
/**
* register, settings & profile forms
*/
@@ -1728,30 +1755,56 @@ div[id$="wrapper"] br {
margin: 30px 0px;
}
.profile-edit-side-div {
- margin: 5px 2px 0 0;
+ display: none;
+}
+/*.profile-edit-side-div:hover {
+ display: block;
}
.profile-edit-side-link {
- margin: 0 20px -18px 0;
- float: right;
+ margin: 3px 0px 0px 70px;
+}*/
+#profiles-menu-trigger {
+ margin: 0px 0px 0px 25px;
}
.profile-listing {
float: left;
margin: 20px 20px 0px 0px;
}
+.icon-profile-edit {
+ background: url("icons.png") -150px 0px no-repeat;
+ border: 0;
+ cursor: pointer;
+ display: block;
+ float: right;
+ width: 20px;
+ height: 20px;
+ margin: 0 0 -18px;
+ position: absolute;
+ text-decoration: none;
+ top: 18px;
+ right: 226px;
+}
#profile-edit-links ul {
margin: 20px 0;
padding: 0;
list-style: none;
}
+.marital {
+ margin-top: 5px;
+}
#register-sitename {
display: inline;
font-weight: bold;
}
#advanced-expire-popup {
-/* background: #2e2f2e;
- color: #eec;*/
+ background: #2e2f2e;
+ color: #eec;
+}
+#id_ssl_policy {
+ width: 374px;
}
+
/**
* contacts selector
*/
@@ -1809,6 +1862,71 @@ div[id$="wrapper"] br {
clear:both;
}
+
+/**
+ * intros
+ */
+.intro-wrapper {
+ margin-top: 20px;
+}
+
+.intro-fullname {
+ font-size: 1.1em;
+ font-weight: bold;
+
+}
+.intro-desc {
+ margin-bottom: 20px;
+ font-weight: bold;
+}
+
+.intro-note {
+ padding: 10px;
+}
+
+.intro-end {
+ padding: 30px;
+}
+
+.intro-form {
+ float: left;
+}
+.intro-approve-form {
+ clear: both;
+}
+.intro-approve-as-friend-end {
+ clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+ margin-right: 20px;
+}
+.intro-submit-approve {
+ margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+ float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+ float: left;
+}
+.intro-form-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+ margin-top: 10px;
+}
+.intro-approve-as-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+.intro-end {
+ clear: both;
+}
+
+
/**
* events
**/
@@ -1961,10 +2079,12 @@ div[id$="wrapper"] br {
.group-selected, .nets-selected {
padding: 3px;
color: #111;
- border: 1px solid #CCCCCC;
- background: #F8F8F8;
+ background: #f8f8f8;
font-weight: bold;
}
+.group-selected:hover, .nets-selected:hover {
+ color: #111;
+}
.groupsideedit {
margin-right: 10px;
}
@@ -2063,12 +2183,12 @@ div[id$="wrapper"] br {
border-bottom: 1px solid #000;
}
#adminpage dt {
- width: 200px;
+ width: 250px;
float: left;
font-weight: bold;
}
#adminpage dd {
- margin-left: 200px;
+ margin-left: 250px;
}
#adminpage h3 {
border-bottom:1px solid #ccc;
@@ -2110,11 +2230,16 @@ div[id$="wrapper"] br {
width: 16px; height: 16px;
}
#adminpage table tr:hover {
- background-color:#bbc7d7;
+/* color: ;*/
+ background-color: #bbc7d7;
}
#adminpage .selectall {
text-align: right;
}
+#adminpage #users a {
+/* color: #;*/
+ text-decoration: underline;
+}
/**
* Form fields
@@ -2294,6 +2419,7 @@ div[id$="wrapper"] br {
background: url(icons.png) no-repeat;
border: 0;
text-decoration: none;
+ border-radius: 5px;
}
.icon:hover {
border: 0;
@@ -2391,7 +2517,7 @@ div[id$="wrapper"] br {
background-position: -70px -40px;
}
.unlock {
- background-position: -90px -40px;
+ background-position: -88px -40px;
}
.video {
background-position: -110px -40px;
@@ -2487,113 +2613,117 @@ footer {
#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper {
display: block !important;
+ background: #eec;
+ color: #2e2f2e;
}
#acl-wrapper {
- width: 690px;
- float: left;
+ width: 660px;
+ margin: 0 auto;
}
#acl-search {
float: right;
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
+ margin: 6px;
}
#acl-showall {
- float:left;
- display:block;
- width:auto;
- height:18px;
- background-color:#CCC;
- background-image:url("../../../images/show_all_off.png");
- background-position:7px 7px;
- background-repeat:no-repeat;
- padding:7px 10px 7px 30px;
- -webkit-border-radius:5px;
- -moz-border-radius:5px;
- border-radius:5px;
- color:#999;
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+ padding: 7px 10px 7px 30px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ color: #999;
+ margin: 5px 0;
}
#acl-showall.selected {
- color:#000;
- background-color:#F90;
- background-image:url(../../../images/show_all_on.png);
+ color: #000;
+ background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
}
#acl-list {
- height:210px;
- border:1px solid #ccc;
- clear:both;
- margin-top:30px;
- overflow:auto;
-}
-#acl-list-content {
+ height: 210px;
+ border: 1px solid #ccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
}
+/*#acl-list-content {
+}*/
.acl-list-item {
- display:block;
- width:150px;
- height:30px;
- border:1px solid #ccc;
- margin:5px;
- float:left;
+ border: 1px solid #ccc;
+ display: block;
+ float: left;
+ height: 110px;
+ margin: 3px 0 5px 5px;
+ width: 120px;
}
.acl-list-item img {
- width:22px;
- height:22px;
- float:left;
- margin:4px;
+ width: 22px;
+ height: 22px;
+ float: left;
+ margin: 5px 5px 20px;
}
.acl-list-item p {
height: 12px;
font-size: 10px;
- margin: 0;
+ margin: 0 0 22px;
padding: 2px 0 1px;
}
.acl-list-item a {
- font-size:8px;
- display:block;
- width:40px;
- height:10px;
- float:left;
- color:#999;
- background-color:#CCC;
- background-position:3px 3px;
- background-repeat:no-repeat;
- margin-right:5px;
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
- border-radius:2px;
- padding-left:15px;
+ background: #ccc 3px 3px no-repeat;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ clear: both;
+ font-size: 10px;
+ display: block;
+ width: 55px;
+ height: 20px;
+ color: #999;
+ margin: 5px auto 0;
+ padding: 0 3px;
+ text-align: center;
+ vertical-align: middle;
}
#acl-wrapper a:hover {
text-decoration:none;
- color:#000;
+ color: #000;
+ border: 0;
}
.acl-button-show {
- background-image:url('../../../images/show_off.png');
+ background-image: url('../../../images/show_off.png');
+ margin: 0 auto;
}
.acl-button-hide {
- background-image:url('../../../images/hide_off.png');
+ background-image: url('../../../images/hide_off.png');
+ margin: 0 auto;
}
.acl-button-show.selected {
- color:#000;
- background-color:#9ade00;
- background-image:url(../../../images/show_on.png);
+ color: #000;
+ background-color: #9ade00;
+ background-image: url(../../../images/show_on.png);
}
.acl-button-hide.selected {
- color:#000;
- background-color:#ff4141;
- background-image:url(../../../images/hide_on.png);
+ color: #000;
+ background-color: #ff4141;
+ background-image: url(../../../images/hide_on.png);
}
.acl-list-item.groupshow {
- border-color:#9ade00;
+ border-color: #9ade00;
}
.acl-list-item.grouphide {
- border-color:#ff4141;
+ border-color: #ff4141;
}
/** /acl **/
/* autocomplete popup */
.acpopup {
- max-height: 150px;
+ max-height: 175px;
+ max-width: 42%;
background-color: #555753;
color: #fff;
overflow: auto;
@@ -2644,7 +2774,7 @@ footer {
@media handheld {
- body {
- font-size: 15pt;
- }
+ body {
+ font-size: 15pt;
+ }
}
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index a7aec1c1a..26e07b1f7 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -1,5 +1,17 @@
<?php
-$a->theme_info = array();
+
+/*
+ * Name: Dispy
+ * Description: Dispy, Friendica theme
+ * Version: 0.9
+ * Author: unknown
+ * Maintainer: Simon <http://simon.kisikew.org/>
+ */
+
+
+$a->theme_info = array(
+ 'extends' => 'dispy'
+);
$a->page['htmlhead'] .= <<< EOT
<script>
@@ -52,6 +64,26 @@ $(document).ready(function() {
$('#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";
+ });
+
+ $('#profiles-menu').click(function(event) {
+ event.stopPropagation();
+ });
+
+ // main function in toolbar functioning
function toggleToolbar() {
if ( $('#nav-floater').is(':visible') ) {
$('#nav-floater').slideUp('fast');
@@ -65,13 +97,32 @@ $(document).ready(function() {
});
}
};
+ // 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'});
+ });
+
+/* $('#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;
-$a->page['footer'] .= <<<EOFooter
-EOFooter;
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index b013cfeef..c67a88635 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -26,11 +26,14 @@
<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="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ {{ 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 }}
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 86453fad2..f251d7352 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -31,11 +31,15 @@
<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="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+
+ {{ 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 }}
@@ -63,6 +67,7 @@
{{ 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>