Merge pull request #113 from simonlnu/master

dispy stable enough to be considered stable IMO
pull/114/merge
Simon 2012-03-08 21:03:16 -08:00
commit 0188e2b3ee
7 changed files with 358 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -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>

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 117 KiB

View File

@ -69,6 +69,9 @@ works -->
{{ 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 }}
@ -105,6 +108,9 @@ 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>

BIN
view/theme/dispy/notifications.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -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>

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -344,6 +344,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;
}
@ -504,6 +510,9 @@ 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;
@ -514,7 +523,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
position: absolute;
top: 0;
left: 16px;
padding-right: 50px;
}
.menu-popup {
position: absolute;
@ -933,10 +941,6 @@ aside #viewcontacts {
#jot-title-wrapper {
margin-bottom: 5px;
}
#jot-title {
border: 1px solid #cccccc;
width: 90%;
}
#jot-title-display {
font-weight: bold;
}
@ -1107,7 +1111,7 @@ section {
clear:both;
}
.wall-item-location {
margin-top: 10px;
margin-top: 15px;
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
@ -1735,6 +1739,7 @@ div[id$="wrapper"] br {
margin: 5px 2px 0 0;
}
.profile-edit-side-link {
margin: 0 20px -18px 0;
float: right;
}
.profile-listing {