aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/dispy')
-rw-r--r--view/theme/dispy/contact_template.tpl2
-rwxr-xr-xview/theme/dispy/experimental0
-rw-r--r--view/theme/dispy/group_side.tpl6
-rw-r--r--view/theme/dispy/head.tpl19
-rw-r--r--view/theme/dispy/icons.pngbin28076 -> 18998 bytes
-rw-r--r--view/theme/dispy/icons.svg72
-rw-r--r--view/theme/dispy/jot-header.tpl14
-rw-r--r--view/theme/dispy/nav.tpl28
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/nets.tpl2
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/next.pngbin891 -> 590 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/notifications.pngbin2253 -> 2494 bytes
-rw-r--r--view/theme/dispy/notifications.svg273
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/photo_view.tpl2
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/premium.pngbin2317 -> 2304 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/prev.pngbin853 -> 593 bytes
-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.css518
-rw-r--r--view/theme/dispy/tag.pngbin632 -> 571 bytes
-rw-r--r--view/theme/dispy/theme.php56
-rw-r--r--view/theme/dispy/wall_item.tpl5
-rw-r--r--view/theme/dispy/wallwall_item.tpl7
22 files changed, 768 insertions, 268 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/experimental b/view/theme/dispy/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/dispy/experimental
+++ /dev/null
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/icons.png b/view/theme/dispy/icons.png
index d9d58aa47..2f0459bd3 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
Binary files differ
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
index 40899c0a5..998e2641f 100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -51,9 +51,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="10.435404"
- inkscape:cx="86.68027"
- inkscape:cy="39.719931"
+ inkscape:zoom="1.9403009"
+ inkscape:cx="73.744486"
+ inkscape:cy="108.36719"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -2101,7 +2101,71 @@
y="0"
xlink:href="#g353"
id="use357"
- transform="translate(-5,6)"
+ transform="translate(-6,6)"
+ width="250"
+ height="200" />
+ <g
+ id="g293"
+ transform="translate(-54.726207,8)">
+ <path
+ transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-566.65386,-61.76762)"
+ 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"
+ sodipodi:cx="559.67499"
+ id="path274"
+ style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+ id="path276"
+ sodipodi:cx="559.67499"
+ sodipodi:cy="21.754047"
+ sodipodi:rx="0.88388348"
+ sodipodi:ry="0.88388348"
+ 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,-391.29289,215.61485)" />
+ <path
+ transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-421.03317,165.44683)"
+ 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"
+ sodipodi:cx="559.67499"
+ id="path279"
+ style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+ inkscape:connector-curvature="0"
+ id="path281"
+ d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+ style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+ id="path283"
+ sodipodi:cx="559.67499"
+ sodipodi:cy="21.754047"
+ sodipodi:rx="0.88388348"
+ sodipodi:ry="0.88388348"
+ 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,-476.37171,94.687576)" />
+ <path
+ transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+ inkscape:connector-curvature="0"
+ id="path285"
+ d="m 567.45319,25.466358 7.6014,-4.065864"
+ style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ <use
+ x="0"
+ y="0"
+ xlink:href="#g293"
+ id="use301"
+ transform="translate(22,0)"
width="250"
height="200" />
</g>
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 867751310..11469dc66 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,5 +1,4 @@
<nav>
-$langselector
<span id="banner">$banner</span>
@@ -58,17 +57,12 @@ 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 }}
+ {{ if $nav.introductions }}
+ <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
+ {{ endif }}
{{ if $nav.profiles }}
<li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
{{ endif }}
@@ -92,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>
@@ -105,12 +107,18 @@ works -->
{{ if $nav.messages }}
<a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
{{ endif }}
+ {{if $nav.introductions }}
+ <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
+ {{ endif }}
</div>
-
</div>
<a href="#" class="floaterflip"></a>
</nav>
+<div id="lang-sel-wrap">
+$langselector
+</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/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/next.png b/view/theme/dispy/next.png
index 353e2e72a..5e0067c4b 100755..100644
--- a/view/theme/dispy/next.png
+++ b/view/theme/dispy/next.png
Binary files differ
diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/notifications.png
index f0f6a90e8..66c432eac 100755..100644
--- a/view/theme/dispy/notifications.png
+++ b/view/theme/dispy/notifications.png
Binary files differ
diff --git a/view/theme/dispy/notifications.svg b/view/theme/dispy/notifications.svg
new file mode 100644
index 000000000..eccc54457
--- /dev/null
+++ b/view/theme/dispy/notifications.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg3486"
+ version="1.1"
+ inkscape:version="0.48+devel r"
+ width="148"
+ height="19"
+ sodipodi:docname="notifications.svg"
+ inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/notifications.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata3492">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3490" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1041"
+ inkscape:window-height="643"
+ id="namedview3488"
+ showgrid="false"
+ inkscape:zoom="4.2687885"
+ inkscape:cx="64.235788"
+ inkscape:cy="18.27268"
+ inkscape:window-x="0"
+ inkscape:window-y="48"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3486"
+ width="0px"
+ height="0px"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <g
+ id="g4437"
+ transform="translate(0,-44)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ transform="translate(0,44)"
+ style="fill:#6c99c9"
+ d="M 34.398531,19 30.225818,10.411298 47.864407,1.3368391 57.625819,19.010154 z"
+ id="path3506"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccccccc"
+ transform="translate(0,44)"
+ style="fill:#4e7db5"
+ d="m 45.148088,5.1797115 -9.353484,4.7866764 6.895762,1.5144501 z m -2.0018,7.2466465 -8.105899,-1.97793 3.232895,6.44678 11.074578,-5.648894 -3.366977,-6.4432724 z M 46.4192,3.6690997 50.56253,11.552848 38.044003,18.006578 33.98857,10.057271 z"
+ id="path3502"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4441"
+ transform="translate(0,-44)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ transform="translate(0,44)"
+ style="fill:#aa7ca5"
+ d="M 64.398531,19 60.225818,10.411298 77.725,2.013353 87.084493,18.988196 z"
+ id="path3504"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="sssssccccc"
+ transform="translate(-0.88048036,44.641441)"
+ style="fill:#75507b"
+ d="m 75,16 c -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 z m -1.441718,-2.172038 c 0,0 -2.448135,-3.9460956 -3.558282,-6.0504682 0,-0.4276216 1.043961,-0.9072067 1.57461,-0.9072067 1.48457,2.2735627 3.276272,6.3043659 3.276272,6.3043659 -0.823179,-0.104873 -0.90154,-0.01483 -1.2926,0.653309 z"
+ id="path3498"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4453"
+ transform="translate(0,-24)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ transform="translate(0,24)"
+ style="fill:#f4ac42;fill-opacity:1"
+ d="M 4.3985314,19 0.19544564,10.348783 18,1.8695178 27,19 z"
+ id="path3508"
+ inkscape:connector-curvature="0" />
+ <g
+ transform="translate(0,-20)"
+ id="g4361">
+ <path
+ sodipodi:type="arc"
+ style="fill:#e98007;fill-opacity:1;stroke:none"
+ id="path274"
+ sodipodi:cx="559.67499"
+ 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"
+ transform="matrix(1.0481621,1.5589904,-1.5589904,1.0481621,-539.42292,-838.01094)" />
+ <path
+ transform="matrix(0.78612158,1.1692428,-1.1692428,0.78612158,-396.15077,-611.38593)"
+ 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"
+ sodipodi:ry="0.88388348"
+ sodipodi:rx="0.88388348"
+ sodipodi:cy="21.754047"
+ sodipodi:cx="559.67499"
+ id="path276"
+ style="fill:#e98007;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#e98007;fill-opacity:1;stroke:none"
+ id="path279"
+ sodipodi:cx="559.67499"
+ 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"
+ transform="matrix(0.8235559,1.224921,-1.224921,0.8235559,-420.44896,-652.37384)" />
+ <path
+ style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+ id="path281"
+ inkscape:connector-curvature="0"
+ transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+ <path
+ transform="matrix(0.89842466,1.3362775,-1.3362775,0.89842466,-465.66125,-710.18506)"
+ 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"
+ sodipodi:ry="0.88388348"
+ sodipodi:rx="0.88388348"
+ sodipodi:cy="21.754047"
+ sodipodi:cx="559.67499"
+ id="path283"
+ style="fill:#e98007;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 567.45319,25.466358 7.6014,-4.065864"
+ id="path285"
+ inkscape:connector-curvature="0"
+ transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+ </g>
+ </g>
+ <g
+ id="g4566"
+ transform="translate(0,-24)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ transform="translate(0,24)"
+ style="fill:#6fcb15"
+ d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+ id="path3500"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 m -0.039261,-0.0651 5.8825232,-3.13423 5.9219702,3.25106 z"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#428107;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+ transform="matrix(0.55727141,-0.25996788,0.2876144,0.61653494,59.024831,-44.715085)"
+ id="path1037" />
+ </g>
+ <g
+ id="g4553"
+ transform="translate(0,-24)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4471"
+ d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+ style="fill:#fb7b62;fill-opacity:1"
+ transform="translate(31,24)"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ 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"
+ sodipodi:ry="1.5964882"
+ sodipodi:rx="2.0660436"
+ sodipodi:cy="194.45924"
+ sodipodi:cx="5.2590199"
+ id="path4218"
+ style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <use
+ height="200"
+ width="250"
+ transform="translate(0.11687856,-8.4237924)"
+ id="use4224"
+ xlink:href="#path4218"
+ y="0"
+ x="0"
+ style="fill:#999999;stroke:#666666" />
+ <use
+ height="200"
+ width="250"
+ transform="translate(6.5982765,5.2049933)"
+ id="use4226"
+ xlink:href="#use4224"
+ y="0"
+ x="0"
+ style="fill:#999999;stroke:#c32405;stroke-opacity:1" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4228"
+ sodipodi:cx="5.2590199"
+ 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"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,81.644877,-64.113316)" />
+ <path
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4230"
+ d="m 10.902837,183.0346 0,3.66687"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4232"
+ d="m 9.2894123,189.68386 -2.3956906,3.56909"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4234"
+ d="m 12.46737,189.68386 2.493472,3.5202"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4236"
+ d="m 12.467368,182.74125 4.009116,9.925"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4238"
+ d="m 9.4849789,182.83904 -4.2046813,9.87611"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+ inkscape:connector-curvature="0"
+ id="path4240"
+ d="m 7.4315299,194.71969 7.0403961,0"
+ style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ </g>
+</svg>
diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index 4582751c6..f1209ec58 100755..100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -17,7 +17,7 @@
</div>
<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/premium.png b/view/theme/dispy/premium.png
index 1ad601c0f..d2855a4f5 100755..100644
--- a/view/theme/dispy/premium.png
+++ b/view/theme/dispy/premium.png
Binary files differ
diff --git a/view/theme/dispy/prev.png b/view/theme/dispy/prev.png
index 0ae6022af..10b10d74f 100755..100644
--- a/view/theme/dispy/prev.png
+++ b/view/theme/dispy/prev.png
Binary files differ
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 472fd875c..812c5ee2e 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -45,12 +45,19 @@ body {
font-size: 16px;
line-height: 1.1em;
}
-
body, button, input, select, textarea {
font-family: sans-serif;
color: #222;
background-color: rgb(254,254,254);
- background-color: rgba(254,254,254,255);
+}
+select {
+ border: 1px #555 dotted;
+ padding: 3px;
+ margin: 2px;
+}
+option {
+ padding: 3px;
+ vertical-align: middle;
}
/* remember to define focus styles! */
:focus {
@@ -69,21 +76,10 @@ mark {
font-style: italic;
font-weight: bold;
}
-ins {
- background: #ff9;
- color: #000;
- text-decoration: none;
-}
-mark {
- background: #ff0;
- color: #000;
- font-style: italic;
- font-weight: bold;
-}
/* Redeclare monospace font family: h5bp.com/j */
pre, code, kbd, samp, .wall-item-body code {
font-family: monospace, monospace;
- _font-family: 'courier new', monospace;
+ _font-family: monospace;
font-size: 1em; }
/* Improve readability of pre-formatted text in all browsers */
@@ -131,6 +127,7 @@ a:hover img {
}
blockquote {
background: #eee;
+ color: #111;
text-indent: 5px;
padding: 5px;
border: 1px #aaa solid;
@@ -138,7 +135,6 @@ blockquote {
}
a:hover {
color: #729fcf;
- padding-bottom: 0;
border-bottom: 1px dotted #729fcf;
}
.required {
@@ -194,14 +190,16 @@ input[type=submit] {
color: #fff;
}
+
/**
* global
*/
/* .tool .action */
.action {
- float: right;
+ margin: 5px 0;
}
+
/**
* login
*/
@@ -209,9 +207,10 @@ input[type=submit] {
margin-right: 20px;
}
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
nav {
height: 60px;
display: block;
@@ -344,6 +343,12 @@ nav .nav-link {
#nav-home-link:hover {
background-position: -66px -132px;
}
+#nav-intro-link {
+ background-position: 0px -190px;
+}
+#nav-intro-link:hover {
+ background-position: -44px -190px;
+}
#nav-login-link {
background-position: 0 -88px;
}
@@ -460,6 +465,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
right: 1%;
padding: 5px;
background: #2e3436;
+ color: transparent;
border-radius: 5px;
z-index: 100;
}
@@ -504,17 +510,21 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
#home-update {
background-position: -90px 0px;
}
+#intro-update {
+ background-position: -120px 0px;
+}
#lang-select-icon {
cursor: pointer;
- position: absolute;
- left: 0;
- top: 0;
+ position: fixed;
+ left: 28px;
+ bottom: 6px;
+ z-index: 10;
}
#language-selector {
- position: absolute;
- top: 0;
- left: 16px;
- padding-right: 50px;
+ position: fixed;
+ bottom: 2px;
+ left: 52px;
+ z-index: 10;
}
.menu-popup {
position: absolute;
@@ -527,9 +537,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;
@@ -577,24 +587,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;
@@ -629,8 +639,24 @@ aside {
.vcard #profile-photo-wrapper {
margin: 20px;
}
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+ * box-shadow:
+ * 1. The horizontal offset of the shadow, positive means
+ * the shadow will be on the right of the box, a negative
+ * offset will put the shadow on the left of the box.
+ * 2. The vertical offset of the shadow, a negative one
+ * means the box-shadow will be above the box, a
+ * positive one means the shadow will be below the box.
+ * 3. The blur radius (optional), if set to 0 the shadow
+ * will be sharp, the higher the number, the more blurred
+ * it will be.
+ * 4. The spread radius (optional), positive values increase
+ * the size of the shadow, negative values decrease the size.
+ * Default is 0 (the shadow is same size as blur).
+ * 5. Colo[u]r
+ */
.vcard #profile-photo-wrapper img {
- box-shadow: 3px 3px 10px 0;
+ box-shadow: 3px 3px 10px 0 #000;
}
aside h4 {
font-size: 1.2em;
@@ -639,8 +665,10 @@ aside #viewcontacts {
text-align: right;
}
.aprofile dt {
- box-shadow: 1px 1px 5px 0;
color: #666666;
+ background: transparent;
+ font-weight: bold;
+ box-shadow: 1px 1px 5px 0 #000;
margin: 15px 0 5px;
padding-left: 5px;
}
@@ -660,7 +688,9 @@ aside #viewcontacts {
#netsearch-box {
margin: 30px 0px;
}
-
+.ttright {
+ margin: 0px 0px 0px 0px;
+}
/**
* contacts block
@@ -703,51 +733,11 @@ aside #viewcontacts {
}
#jot #jot-tools span a {
display: block;
- /*color: #cccccc; */
- /*width: 100%; */
- /*height: 40px; */
- /*text-align: center;*/
- /*line-height: 40px; */
- /*overflow: hidden;*/
}
-/*#jot #jot-tools li:hover {*/
- /*background-color: #364e59;*/
-/*}*/
#jot #jot-tools .perms {
float: right;
width: 40px;
}
-/*#jot #jot-tools .perms a.unlock {*/
-/* width: 30px; */
-/* border-left: 10px solid #cccccc;*/
-/* background-color: #cccccc; */
-/*}*/
-/*#jot #jot-tools .perms a.lock {*/
-/* width: 30px; */
-/* border-left: 10px solid #666666;*/
-/* background-color: #666666; */
-/*}*/
-/*#jot #jot-tools li.submit { */
-/* float: right; */
-/* background-color: #cccccc; */
-/* border-bottom: 2px solid #cccccc; */
-/* border-right: 1px solid #666666; */
-/* border-left: 1px solid #666666; */
-/*} */
-/*#jot #jot-tools li.submit input { */
-/* border: 0px; */
-/* margin: 0px; */
-/* padding: 0px; */
-/* background-color: #cccccc; */
-/* color: #666666; */
-/* width: 80px; */
-/* height: 40px; */
-/* line-height: 40px; */
-/*} */
-/*#jot #jot-tools li.submit input:hover {*/
-/* background-color: #bdcdd4; */
-/* color: #666666; */
-/*} */
#jot #jot-tools li.loading {
float: right;
background-color: #ffffff;
@@ -783,6 +773,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,
@@ -822,6 +821,9 @@ aside #viewcontacts {
border-bottom: 0;
padding: 5px;
}
+#profile-jot-net {
+ margin: 5px 0;
+}
#jot-preview-link {
margin: 0 0 0 10px;
border: 0;
@@ -837,18 +839,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;
@@ -866,23 +869,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;
@@ -925,18 +926,15 @@ 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;
}
-#jot-title {
- border: 1px solid #cccccc;
- width: 90%;
-}
#jot-title-display {
font-weight: bold;
}
@@ -945,17 +943,22 @@ aside #viewcontacts {
}
#jot-preview-content {
background-color: #ffffe0;
- border: 1px #aaaa00 solid;
+ color: #111;
+ border: 1px #aa0 solid;
border-radius: 3px;
padding: 3px 3px 6px 10px;
}
+#jot-preview-content .wall-item-outside-wrapper {
+ border: 0;
+ border-radius: 0px;
+}
/**
* section
*/
section {
- margin: 20px 6% 0 4%;
+ margin: 20px 8% 0 4%;
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
@@ -964,28 +967,32 @@ section {
/** tabs **/
.tabs {
list-style: none;
- margin: 10px 0 10px;
+ margin: 10px 0;
padding: 0;
- border-bottom: 1px solid #729fcf;
- font-size: 14px;
}
.tabs li {
display: inline;
}
.tab {
- padding: 0 5px;
+ border: 1px solid #729fcf;
+ padding: 4px;
}
.tab:hover {
- background-color: #729fcf;
+ background: #729fcf;
color: #eeeeec;
- border: 0px;
}
.tab:active {
- background-color: #729fcf;
+ background: #729fcf;
color: #eeeeec;
- border: 0px;
}
-
+.tab.active {
+ background: #729fcf;
+ color: #eeeeec;
+}
+.tab a {
+ border: 0;
+ text-decoration: none;
+}
/**
* items
@@ -1011,6 +1018,9 @@ section {
.shiny {
background: #efefdf;
}
+.heart {
+ color: red;
+}
.wall-item-content {
overflow-x: auto;
}
@@ -1097,7 +1107,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;
@@ -1107,7 +1117,7 @@ section {
clear:both;
}
.wall-item-location {
- margin-top: 10px;
+ margin-top: 15px;
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
@@ -1246,7 +1256,7 @@ section {
}
[class^="comment-edit-text"] {
margin: 5px 0 10px 20px;
- width: 86.5%;
+ width: 84.5%;
}
.comment-edit-text-empty {
height: 20px;
@@ -1292,11 +1302,12 @@ section {
**/
.wall-item-body code {
display: block;
- padding-left: 10px;
+ padding: 0 0 10px 5px;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 10px;
background: #eee;
+ color: #444;
width: 95%;
}
@@ -1333,10 +1344,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;
@@ -1505,20 +1517,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;
@@ -1553,8 +1570,7 @@ div[id$="wrapper"] br {
.view-contact-wrapper,
.contact-entry-wrapper {
float: left;
- margin-right: 5px;
- margin-bottom: 40px;
+ margin: 0 5px 40px 0;
width: 120px;
height: 120px;
padding: 3px;
@@ -1666,8 +1682,9 @@ div[id$="wrapper"] br {
}
.contact-photo-menu {
width: auto;
- border: 2px solid #444444;
- background: #FFFFFF;
+ border: 2px solid #444;
+ background: #eee;
+ color: #111;
position: absolute;
left: 0px; top: 90px;
display: none;
@@ -1689,7 +1706,6 @@ div[id$="wrapper"] br {
}
-
/**
* register, settings & profile forms
*/
@@ -1706,6 +1722,7 @@ div[id$="wrapper"] br {
-moz-border-radius: 5px;
border-radius: 5px;
padding: 5px;
+ color: #111;
}
#settings-default-perms {
margin-bottom: 20px;
@@ -1715,51 +1732,84 @@ div[id$="wrapper"] br {
clear: both;
}
-#register-form label,
-#profile-edit-form label {
- width: 300px;
- float: left;
-}
+/*#register-form label, */
+/*#profile-edit-form label {*/
+/* width: 300px; */
+/* float: left; */
+/*} */
-#register-form span,
-#profile-edit-form span {
- color:#555753;
- display:block;
- margin-bottom:20px;
+/*#register-form span, */
+/*#profile-edit-form span {*/
+/* color: #555753; */
+/* display: block; */
+/* margin-bottom: 20px; */
+/*} */
+#profile-edit-marital-label span {
+ margin: -4px;
}
.settings-submit-wrapper,
.profile-edit-submit-wrapper {
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 {
- 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;
+}
+#id_ssl_policy {
+ width: 374px;
+}
+
/**
* contacts selector
*/
.group-delete-wrapper {
- margin: -28px 150px 0 0;
+ margin: -31px 122px 0 0;
float: right;
}
+
#group-edit-submit-wrapper {
margin: 0 0 10px 0;
display: inline;
@@ -1943,7 +1993,12 @@ div[id$="wrapper"] br {
*/
.directory-item {
float: left;
- margin: 50px 50px 0px 0px;
+ /*margin: 50px 50px 0px 0px;*/
+ margin: 0 5px 4px 0;
+ padding: 3px;
+ width: 180px;
+ height: 250px;
+ position: relative;
}
@@ -1955,10 +2010,13 @@ div[id$="wrapper"] br {
}
.group-selected, .nets-selected {
padding: 3px;
- border: 1px solid #CCCCCC;
- background: #F8F8F8;
+ color: #111;
+ background: #f8f8f8;
font-weight: bold;
}
+.group-selected:hover, .nets-selected:hover {
+ color: #111;
+}
.groupsideedit {
margin-right: 10px;
}
@@ -1987,7 +2045,9 @@ div[id$="wrapper"] br {
text-decoration: none;
text-align: center;
}
-
+#peoplefind-sidebar form {
+ margin-bottom: 10px;
+}
#sidebar-new-group:hover {
/*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
/*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
@@ -1998,6 +2058,18 @@ div[id$="wrapper"] br {
position: relative;
top: 1px;
}
+#side-peoplefind-url {
+ background-color: #e5e0cf;
+ color: #666;
+ border: 1px 666 solid;
+ margin-right: 3px;
+ width: 75%;
+}
+#side-peoplefind-url:hover, #side-peoplefind-url:focus {
+ background-color: #efefef;
+ color: #222;
+ border: 1px 333 solid;
+}
.nets-ul {
list-style-type: none;
padding-left: 0px;
@@ -2043,12 +2115,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;
@@ -2105,7 +2177,7 @@ div[id$="wrapper"] br {
overflow: auto;
width: 100%;
}
-.field label {
+.field label, label {
float: left;
width: 275px;
display: block;
@@ -2116,8 +2188,9 @@ div[id$="wrapper"] br {
padding: 5px;
background: #eee;
vertical-align: middle;
+ color: #111;
}
-.field input {
+.field input, input[type="text"] {
width: 250px;
height: 25px;
border: 1px #999 solid;
@@ -2156,7 +2229,7 @@ div[id$="wrapper"] br {
display:none !important;
}
.field.radio .field_help {
- margin-left: 0;
+ margin-left: 297px;
}
@@ -2166,8 +2239,8 @@ div[id$="wrapper"] br {
.popup {
width: 100%;
height: 100%;
- top:0px;
- left:0px;
+ top: 0px;
+ left: 0px;
position: absolute;
display: none;
}
@@ -2273,6 +2346,7 @@ div[id$="wrapper"] br {
background: url(icons.png) no-repeat;
border: 0;
text-decoration: none;
+ border-radius: 5px;
}
.icon:hover {
border: 0;
@@ -2282,12 +2356,6 @@ div[id$="wrapper"] br {
.icon.drophide, .icon.delete {
float: left;
}
-/*.icon.s22 {
- display: block;
- background: url(icons.png) no-repeat;
- width: 22px;
- height: 22px;
-}*/
.icon.s22.delete {
display: block;
background-position: -110px 0;
@@ -2376,7 +2444,7 @@ div[id$="wrapper"] br {
background-position: -70px -40px;
}
.unlock {
- background-position: -90px -40px;
+ background-position: -88px -40px;
}
.video {
background-position: -110px -40px;
@@ -2472,113 +2540,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;
@@ -2627,3 +2699,9 @@ footer {
display: inline-block;
}
+
+@media handheld {
+ body {
+ font-size: 15pt;
+ }
+}
diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
index aca10707a..9b5a7223e 100644
--- a/view/theme/dispy/tag.png
+++ b/view/theme/dispy/tag.png
Binary files differ
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index c72884f1a..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,10 +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;
+
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>