diff options
Diffstat (limited to 'view/theme')
-rw-r--r-- | view/theme/diabook/nav.tpl | 4 | ||||
-rwxr-xr-x | view/theme/dispy/experimental | 0 | ||||
-rw-r--r-- | view/theme/dispy/icons.png | bin | 28076 -> 18998 bytes | |||
-rw-r--r-- | view/theme/dispy/icons.svg | 72 | ||||
-rw-r--r-- | view/theme/dispy/jot-header.tpl | 10 | ||||
-rw-r--r-- | view/theme/dispy/jot.tpl | 73 | ||||
-rw-r--r-- | view/theme/dispy/nav.tpl | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | view/theme/dispy/next.png | bin | 891 -> 590 bytes | |||
-rw-r--r--[-rwxr-xr-x] | view/theme/dispy/notifications.png | bin | 2253 -> 2494 bytes | |||
-rw-r--r-- | view/theme/dispy/notifications.svg | 273 | ||||
-rw-r--r--[-rwxr-xr-x] | view/theme/dispy/premium.png | bin | 2317 -> 2304 bytes | |||
-rw-r--r--[-rwxr-xr-x] | view/theme/dispy/prev.png | bin | 853 -> 593 bytes | |||
-rw-r--r-- | view/theme/dispy/style.css | 195 | ||||
-rw-r--r-- | view/theme/dispy/tag.png | bin | 632 -> 571 bytes | |||
-rw-r--r-- | view/theme/testbubble/theme.php | 9 |
15 files changed, 516 insertions, 126 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 5776b6cf7..8b32ebe6c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -152,6 +152,10 @@ </ul> +<ul id="nav-notifications-template" style="display:none;" rel="template"> + <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> +</ul> + {# 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/icons.png b/view/theme/dispy/icons.png Binary files differindex d9d58aa47..2f0459bd3 100644 --- a/view/theme/dispy/icons.png +++ b/view/theme/dispy/icons.png 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 e72000b4c..43dcdbb84 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,12 +1,7 @@ -<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> -<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script> <script type="text/javascript"> - var editor = false; var textlen = 0; var plaintext = '$editselect'; -// this is here because of the silly tinymce error. didn't help. -var skin = 'default'; function initEditor(cb) { if (editor==false) { @@ -119,7 +114,9 @@ function enableOnUser(){ $(this).val(""); initEditor(); } - +</script> +<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script> +<script type="text/javascript"> var ispublic = '$ispublic'; var addtitle = '$addtitle'; @@ -127,6 +124,7 @@ function enableOnUser(){ /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); + /* enable character counter */ $("#profile-jot-text").focus(charCounter); $("#profile-jot-text").click(charCounter); diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 7e0f9efa4..94c31da23 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -12,46 +12,61 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> - <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - - <div id="jot-tools" class="jothidden" style="display:none"> - <span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span> - <span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span> - <span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span> - <span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span> - <span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span> - <span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span> - <span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span> - $jotplugins - <ul id="profile-jot-submit-wrapper"> - <li> - <a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a> - </li> - - <li id="profile-jot-perms" class="profile-jot-perms"> - <a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a> - </li> - - <li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li> - - </ul> - <span id="profile-rotator" class="loading" style="display: none"> - <img src="images/rotator.gif" alt="$wait" title="$wait" /></span> + <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }} + </textarea> + + +<div id="jot-tools" class="jothidden" style="display:none"> + <div id="profile-jot-submit-wrapper" class="jothidden"> + + <div id="profile-upload-wrapper" style="display: $visitor;"> + <div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div> + </div> + <div id="profile-attach-wrapper" style="display: $visitor;"> + <div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div> + </div> + <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"> + <a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a> + </div> + <div id="profile-video-wrapper" style="display: $visitor;"> + <a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a> + </div> + <div id="profile-audio-wrapper" style="display: $visitor;"> + <a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a> + </div> + <div id="profile-location-wrapper" style="display: $visitor;"> + <a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a> </div> + <div id="profile-nolocation-wrapper" style="display: none;"> + <a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a> + </div> + + <div id="profile-jot-plugin-wrapper"> + $jotplugins + </div> + + <a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a> + <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> + <div id="profile-jot-perms" class="profile-jot-perms"> + <a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a> </div> + <span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span> + </div> + + </div> <!-- /#profile-jot-submit-wrapper --> +</div> <!-- /#jot-tools --> <div id="jot-preview-content" style="display:none;"></div> - <div style="display: none;"> <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> $acl - <hr style="clear:both"/> - <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> + <hr style="clear:both" /> + <div id="profile-jot-email-label">$emailcc</div> + <input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> <div id="profile-jot-email-end"></div> $jotnets </div> </div> </form> - {{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 867751310..4a030e7ae 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -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> diff --git a/view/theme/dispy/next.png b/view/theme/dispy/next.png Binary files differindex 353e2e72a..5e0067c4b 100755..100644 --- a/view/theme/dispy/next.png +++ b/view/theme/dispy/next.png diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/notifications.png Binary files differindex f0f6a90e8..66c432eac 100755..100644 --- a/view/theme/dispy/notifications.png +++ b/view/theme/dispy/notifications.png 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/premium.png b/view/theme/dispy/premium.png Binary files differindex 1ad601c0f..d2855a4f5 100755..100644 --- a/view/theme/dispy/premium.png +++ b/view/theme/dispy/premium.png diff --git a/view/theme/dispy/prev.png b/view/theme/dispy/prev.png Binary files differindex 0ae6022af..10b10d74f 100755..100644 --- a/view/theme/dispy/prev.png +++ b/view/theme/dispy/prev.png diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 0032c4866..0977d5fcb 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -24,9 +24,9 @@ audio:not([controls]) { display: none; } -/* ============================================================================= - Base - ========================================================================== */ +/* + * Base + */ /* * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units @@ -45,12 +45,18 @@ 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; } /* remember to define focus styles! */ :focus { @@ -143,7 +149,10 @@ a:hover { } .required { display: inline; - color: #ff0000; + color: #ff0; + font-size: 16px; + font-weight: bold; + margin: 3px; } .fakelink, .lockview { color: #3465a4; @@ -341,6 +350,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; } @@ -501,6 +516,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; @@ -511,7 +529,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; @@ -584,26 +601,26 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link border:2px solid #f8911b; border-bottom:0; padding-bottom: 50px; - z-index:1000; + 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; + position: fixed; + bottom: 0; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; padding: 10px; - background-color:#fcaf3e; - border:2px solid #f8911b; - border-bottom:0; + background-color: #fcaf3e; + border: 2px solid #f8911b; + border-bottom: 0; padding-bottom: 50px; - z-index:1000; + z-index: 1000; } #sysmsg_info br, #sysmsg br { - display:block; - margin:2px 0px; - border-top:1px solid #ccccce; + display: block; + margin: 2px 0px; + border-top: 1px solid #ccccce; } @@ -613,14 +630,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link aside { position: absolute; right: 15px; - width: 255px; + width: 245px; + padding-top: 15px; font-size: smaller; } .vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; - padding-top: 3px; + padding-bottom: 3px; } .vcard #profile-photo-wrapper { margin: 20px; @@ -687,7 +705,7 @@ aside #viewcontacts { #jot #jot-tools { margin: 0px; padding: 0px; - height: 40px; + height: 35px; overflow: none; width: 100%; /*background-color: #0e232e;*/ @@ -757,28 +775,21 @@ aside #viewcontacts { margin-top: 10px; } #jot #jot-title { - border: 0px; + border: 1px solid #ccc; margin: 0 0 5px; height: 20px; width: 90%; font-weight: bold; border-radius: 5px; vertical-align: middle; - padding: 5px 1px; -} -#jot #jot-title:hover, -#jot #jot-title:focus { - border: 1px solid #999; - border-radius: 5px; } #jot #character-counter { - width: 40px; - float: right; - text-align: right; - height: 20px; - line-height: 20px; - padding: 5px; - margin: 0 0 5px; + width: 6%; + float: right; + text-align: right; + height: 15px; + line-height: 20px; + padding: 2px 20px 5px 0; } #profile-jot-text_tbl { margin-bottom: 10px; @@ -787,15 +798,15 @@ aside #viewcontacts { width:99.900002% !important; } #profile-attach-wrapper, -#profile-audio, +#profile-audio-wrapper, #profile-link-wrapper, -#profile-location, -#profile-nolocation, +#profile-location-wrapper, +#profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, -#profile-video { +#profile-video-wrapper { float: left; - margin-left: 10px; + margin: 0 20px 0 0; } #profile-rotator-wrapper { float: right; @@ -826,9 +837,10 @@ aside #viewcontacts { padding: 5px; } #jot-preview-link { - margin: 0 0 0 25px; + margin: 0 0 0 10px; border: 0; text-decoration: none; + float: right; } .icon-text-preview { margin: 0 0 -18px 0; @@ -838,9 +850,10 @@ aside #viewcontacts { background: url(icons.png) no-repeat -128px -40px; border: 0; text-decoration: none; + float: right; } #profile-jot-perms { - /*float: right;*/ + float: right; background-color: #555753; height: 22px; width: 20px; @@ -851,17 +864,18 @@ aside #viewcontacts { border: 0px; margin: 0 -4px 0 10px; } +#profile-jot-plugin-wrapper { + width: 1px; + margin: 10px 0 0 0; + float: right; +} #profile-jot-submit-wrapper { float: right; - width: 30%; + width: 100%; list-style: none; margin: 10px 0 0 0; padding: 0; } -#profile-jot-submit-wrapper li { - display: inline-block; - vertical-align: middle; -} #profile-jot-submit { height: 22px; background-color: #555753; @@ -871,6 +885,7 @@ aside #viewcontacts { border-radius: 0 5px 5px 0; border: 0; margin: 0; + float: right; } #jot-perms-icons { background-color: #555753; @@ -932,10 +947,6 @@ aside #viewcontacts { #jot-title-wrapper { margin-bottom: 5px; } -#jot-title { - border: 1px solid #cccccc; - width: 90%; -} #jot-title-display { font-weight: bold; } @@ -956,7 +967,7 @@ aside #viewcontacts { section { margin: 20px 6% 0 4%; font-size: 0.8em; - padding-right: 250px; + padding-right: 230px; min-width: 475px; } @@ -1002,7 +1013,6 @@ section { .wall-item-content-wrapper { position: relative; padding: 10px; - overflow-x: auto; width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { @@ -1014,12 +1024,12 @@ section { .wall-item-content { overflow-x: auto; } +/* removing it from here, vs. putting it in .wall-item-content + * might break things for people. we shall see ;) */ [id^="tread-wrapper"], [class^="tread-wrapper"] { margin: 15px 0 0 0; - /*border: 1px #aaa solid;*/ - /*border-radius: 5px;*/ padding: 0px; - overflow-x: auto; + /*overflow-x: auto;*/ } .wall-item-photo-menu { display: none; @@ -1107,9 +1117,9 @@ section { clear:both; } .wall-item-location { - margin-top: 5px; + margin-top: 15px; width: 100px; - overflow:hidden; + overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; } @@ -1130,14 +1140,14 @@ section { display: none; } .wallwall .wwto { - left:-10px; + left: 5px; margin: 0; - position:absolute; - top:65px; + position: absolute; + top: 75px; width: 30px; - z-index:10001; - width:30px; - height:30px; + z-index: 10001; + width: 30px; + height: 30px; } .wallwall .wwto img { width: 30px !important; @@ -1148,8 +1158,8 @@ section { } .wall-item-arrowphoto-wrapper { position: absolute; - left: 20px; - top: 70px; + left: 35px; + top: 80px; z-index: 10002; } .wall-item-photo-menu { @@ -1160,7 +1170,7 @@ section { position: absolute; left: -2px; top: 101px; display: none; - z-index: 10000; + z-index: 10003; -webkit-border-radius: 0px 5px 5px 5px; -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; @@ -1732,11 +1742,11 @@ div[id$="wrapper"] br { margin: 30px 0px; } .profile-edit-side-div { - margin-top: 10px; + margin: 5px 2px 0 0; } .profile-edit-side-link { + margin: 0 20px -18px 0; float: right; - margin: 10px 20px -16px 0; } .profile-listing { float: left; @@ -1988,7 +1998,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% );*/ @@ -1999,6 +2011,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; @@ -2106,7 +2130,7 @@ div[id$="wrapper"] br { overflow: auto; width: 100%; } -.field label { +.field label, label { float: left; width: 275px; display: block; @@ -2118,15 +2142,13 @@ div[id$="wrapper"] br { background: #eee; vertical-align: middle; } -.field input { +.field input, input[type="text"] { width: 250px; height: 25px; border: 1px #999 solid; } .field textarea { width: 80%; -} -.field textarea { height: 100px; } .field_help { @@ -2158,7 +2180,6 @@ div[id$="wrapper"] br { .hidden { display:none !important; } - .field.radio .field_help { margin-left: 0; } @@ -2286,12 +2307,12 @@ div[id$="wrapper"] br { .icon.drophide, .icon.delete { float: left; } -.icon.s22 { +/*.icon.s22 { display: block; background: url(icons.png) no-repeat; width: 22px; height: 22px; -} +}*/ .icon.s22.delete { display: block; background-position: -110px 0; @@ -2582,17 +2603,17 @@ footer { /* autocomplete popup */ .acpopup { - max-height:150px; - background-color:#555753; - color: #FFFFFF; - overflow:auto; - z-index:100000; - border:1px solid #cccccc; + max-height: 150px; + background-color: #555753; + color: #fff; + overflow: auto; + z-index: 100000; + border: 1px solid #cccccc; } .acpopupitem { - background-color:#555753; + background-color: #555753; padding: 4px; - clear:left; + clear: left; } .acpopupitem img { float: left; diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png Binary files differindex aca10707a..9b5a7223e 100644 --- a/view/theme/dispy/tag.png +++ b/view/theme/dispy/tag.png diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php new file mode 100644 index 000000000..87ce4dd73 --- /dev/null +++ b/view/theme/testbubble/theme.php @@ -0,0 +1,9 @@ +<?php + +/* + * Name: Test Bubble + * Version: 1.1 + * Author: Anne Walk + * Author: Devlon Duthied + * Maintainer: Mike Macgirvin <mike@macgirvin.com> + */ |