diff options
author | Simon <simon@kisikew.org> | 2012-03-28 02:55:15 -0700 |
---|---|---|
committer | Simon <simon@kisikew.org> | 2012-03-28 02:55:15 -0700 |
commit | 40a65d38e04df5256d05f2a16497c39f83f51bd5 (patch) | |
tree | e59b33f871c6ca8184bb8f0f40e228b3f5d49392 /view/theme | |
parent | 7fc57f486fb91da67c190ef8563d872a3570ded6 (diff) | |
parent | bcf8a571f96f1f93ee3d2f8c6a6da7f9d6bd5da8 (diff) | |
download | volse-hubzilla-40a65d38e04df5256d05f2a16497c39f83f51bd5.tar.gz volse-hubzilla-40a65d38e04df5256d05f2a16497c39f83f51bd5.tar.bz2 volse-hubzilla-40a65d38e04df5256d05f2a16497c39f83f51bd5.zip |
Merge pull request #178 from simonlnu/master
i fixed the worst but ...
Diffstat (limited to 'view/theme')
20 files changed, 321 insertions, 130 deletions
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index dfc0467f7..2876f936e 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -2,8 +2,43 @@ <div>$page</div> {{ endif }} -<h3>PostIt to Friendica</h3> -<div style="padding-left: 8px;"> -<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span> +{{ if $lastusers_title }} +<h3 id="extra-help-header">Help or '@NewHere'?</h3> +<div id="extra-help"> +<a href="https://helpers.pyxis.uberspace.de/profile/helpers" + title="Friendica Support" target="_blank">Friendica Support</a><br /> +<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" + title="Let's talk" target="_blank">Let's talk</a><br /> +<a href="http://newzot.hydra.uberspace.de/profile/newzot" + title="Local Friendica" target="_blank">Local Friendica</a><br /> +<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a> </div> {{ endif }} + +{{ if $lastusers_title }} +<h3 id="connect-services-header">Connectable Services</h3> +<div id="connect-services"> +<a href="$url/facebook"><img alt="Facebook" + src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a> +<a href="$url/settings/connectors"><img + alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a> +<a href="$url/settings/connectors"><img + alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a> +<a href="$url/settings/connectors"><img + alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br /> +<a href="$url/settings/connectors"><img + alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a> +<a href="$url/settings/connectors"><img + alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a> +<a href="$url/settings/connectors"><img + alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a> +<a href="$url/settings/connectors"><img + alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a> +</div> +{{ endif }} + +<h3 id="postit-header">PostIt to Friendica</h3> +<div id="postit"> +<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. +</div> + diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php new file mode 100644 index 000000000..e74ec1a4f --- /dev/null +++ b/view/theme/dispy-dark/default.php @@ -0,0 +1,20 @@ +<!DOCTYPE html> +<html> +<head> + <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> + <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> +</head> +<body> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <aside> + <?php if(x($page,'aside')) echo $page['aside']; ?> + <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> + </aside> + <section><?php if(x($page,'content')) echo $page['content']; ?> + <div id="page-footer"></div> + </section> + <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> +</body> +</html> + diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 589d68352..e38b2bbe2 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -45,13 +45,7 @@ works --> {{ endif }} </div> - <div class="search-box"> - <form method="get" action="$nav.search.0"> - <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> - </form> - </div> - - <div id="user-menu"> + <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> <ul id="user-menu-popup" onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" @@ -125,6 +119,12 @@ works --> $langselector </div> +<div class="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> +</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-dark/style.css b/view/theme/dispy-dark/style.css index 8be441c8b..361648999 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -251,7 +251,7 @@ input[type=submit] { * nav */ nav { - height: 85px; + height: 60px; display: block; background-color: #1d1f1d; color: #eeeeec; @@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 170px; position: absolute; top: -19px; - left: 15px; + left: 7px; } #nav-floater { position: fixed; @@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: transparent; border-radius: 5px; z-index: 100; - width: 28%; - height: 80px; + width: 300px; + height: 60px; } #nav-buttons { clear: both; list-style: none; padding: 0px; + margin: 0 7px 0 0; height: 25px; } #nav-buttons li { @@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .search-box { display: inline-block; - height: 20px; - margin: 0; - position: relative; - left: 7px; - top: 5px; - /*width: 210px;*/ + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: #1d1f1d; + border-radius: 5px; } #search-text { border: 1px #eec solid; background: #2e2f2e; color: #eec; } +.search-box #search-text { + margin: 8px; + width: 10em; + color: #eec; +} nav #user-menu { display: block; width: 75%; @@ -529,8 +536,8 @@ nav #user-menu { border-radius: 5px; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; clear: both; - top: 12px; - left: 7px; + top: 4px; + left: 10px; } nav #user-menu-label { font-size: 12px; @@ -641,6 +648,7 @@ nav #user-menu-label { background: #ddd; } + /** sysmsg **/ #sysmsg_info { position: fixed; @@ -752,6 +760,7 @@ aside #viewcontacts { margin: 0px 0px 0px 0px; } + /** * contacts block */ @@ -1018,7 +1027,7 @@ aside #viewcontacts { * section */ section { - margin: 20px 8% 0 4%; + margin: 20px 9% 0 4%; font-size: 0.8em; padding-right: 230px; min-width: 475px; @@ -1057,6 +1066,7 @@ section { text-decoration: none; } + /** * items */ @@ -1129,7 +1139,7 @@ section { border-radius: 5px; } [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { - margin: 0 0 5px 0; + /*margin: 0 0 5px 0;*/ } .wall-item-tools { float: right; @@ -1150,6 +1160,12 @@ section { -ms-transition: all 1s ease-in-out; transition: all 1s ease-in-out; } +.wall-item-subtools1 { + list-style: none; +} +.wall-item-subtools2 { + list-style: none; +} .wall-item-title { font-size: 1.2em; font-weight: bold; @@ -1260,6 +1276,24 @@ section { overflow: auto; width: 100%; } +#connect-services-header { + +} +#connect-services { + margin: 5px 0 0 0; +} +#extra-help-header { + +} +#extra-help { + margin: 5px 0 0 0; +} +#postit-header { + +} +#postit { + margin: 5px 0 0 0; +} /** diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 4c938997b..84cbc05cd 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -91,11 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); + $('.search-box').slideDown('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideUp('fast'); } }; // our trigger for the toolbar button @@ -151,6 +153,13 @@ function dispydark_community_info() { $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside'] = replace_macros($tpl, $aside); + $a->page['aside_bottom'] = replace_macros($tpl, $aside); } +// use our 'default.php' instead of the system-wide one +$a->page['template'] = "theme/dispy-dark/default"; + +// aside on profile page +if ($a->argv[0] === "profile") { + dispydark_community_info(); +} diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index c9ac20c89..4b973bf93 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -15,44 +15,45 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper"> - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - </div> <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.star }} - <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="#" 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 }} - - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> - {{ endif }} - - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} + <ul class="wall-item-subtools1"> + <li class="wall-item-lock-wrapper"> + {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </li> + {{ if $item.star }} + <li> + <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> + </li> + {{ endif }} + {{ if $item.vote }} + <li 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="#" 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;" /> + </li> + {{ endif }} + </ul> + <ul class="wall-item-subtools2"> + {{ if $item.filer }} + <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li> + {{ endif }} + {{ if $item.plink }} + <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li> + {{ endif }} + {{ if $item.edpost }} + <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li> + {{ endif }} + <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id"> + {{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }} + {{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }} + </li> + </ul> <div class="wall-item-delete-end"></div> - </div> <div class="wall-item-content" id="wall-item-content-$item.id" > <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index dfc0467f7..2876f936e 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -2,8 +2,43 @@ <div>$page</div> {{ endif }} -<h3>PostIt to Friendica</h3> -<div style="padding-left: 8px;"> -<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span> +{{ if $lastusers_title }} +<h3 id="extra-help-header">Help or '@NewHere'?</h3> +<div id="extra-help"> +<a href="https://helpers.pyxis.uberspace.de/profile/helpers" + title="Friendica Support" target="_blank">Friendica Support</a><br /> +<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" + title="Let's talk" target="_blank">Let's talk</a><br /> +<a href="http://newzot.hydra.uberspace.de/profile/newzot" + title="Local Friendica" target="_blank">Local Friendica</a><br /> +<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a> </div> {{ endif }} + +{{ if $lastusers_title }} +<h3 id="connect-services-header">Connectable Services</h3> +<div id="connect-services"> +<a href="$url/facebook"><img alt="Facebook" + src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a> +<a href="$url/settings/connectors"><img + alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a> +<a href="$url/settings/connectors"><img + alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a> +<a href="$url/settings/connectors"><img + alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br /> +<a href="$url/settings/connectors"><img + alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a> +<a href="$url/settings/connectors"><img + alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a> +<a href="$url/settings/connectors"><img + alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a> +<a href="$url/settings/connectors"><img + alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a> +</div> +{{ endif }} + +<h3 id="postit-header">PostIt to Friendica</h3> +<div id="postit"> +<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. +</div> + diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php new file mode 100644 index 000000000..e74ec1a4f --- /dev/null +++ b/view/theme/dispy/default.php @@ -0,0 +1,20 @@ +<!DOCTYPE html> +<html> +<head> + <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> + <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> +</head> +<body> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <aside> + <?php if(x($page,'aside')) echo $page['aside']; ?> + <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> + </aside> + <section><?php if(x($page,'content')) echo $page['content']; ?> + <div id="page-footer"></div> + </section> + <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> +</body> +</html> + diff --git a/view/theme/dispy/icons/StatusNet.png b/view/theme/dispy/icons/StatusNet.png Binary files differnew file mode 100644 index 000000000..1b5f9a677 --- /dev/null +++ b/view/theme/dispy/icons/StatusNet.png diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png Binary files differnew file mode 100644 index 000000000..b9d64cb93 --- /dev/null +++ b/view/theme/dispy/icons/email.png diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png Binary files differnew file mode 100644 index 000000000..ff5129f94 --- /dev/null +++ b/view/theme/dispy/icons/facebook.png diff --git a/view/theme/dispy/icons/livejournal.png b/view/theme/dispy/icons/livejournal.png Binary files differnew file mode 100644 index 000000000..5ba5f7f7d --- /dev/null +++ b/view/theme/dispy/icons/livejournal.png diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png Binary files differnew file mode 100644 index 000000000..d0ae6face --- /dev/null +++ b/view/theme/dispy/icons/posterous.png diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png Binary files differnew file mode 100644 index 000000000..9d5fcd045 --- /dev/null +++ b/view/theme/dispy/icons/tumblr.png diff --git a/view/theme/dispy/icons/twitter.png b/view/theme/dispy/icons/twitter.png Binary files differnew file mode 100644 index 000000000..4a068451e --- /dev/null +++ b/view/theme/dispy/icons/twitter.png diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png Binary files differnew file mode 100644 index 000000000..6a4e36d45 --- /dev/null +++ b/view/theme/dispy/icons/wordpress.png diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 589d68352..e38b2bbe2 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -45,13 +45,7 @@ works --> {{ endif }} </div> - <div class="search-box"> - <form method="get" action="$nav.search.0"> - <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> - </form> - </div> - - <div id="user-menu"> + <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> <ul id="user-menu-popup" onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" @@ -125,6 +119,12 @@ works --> $langselector </div> +<div class="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> +</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/style.css b/view/theme/dispy/style.css index 74a7809a1..c2c746767 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -251,7 +251,7 @@ input[type=submit] { * nav */ nav { - height: 85px; + height: 60px; display: block; background-color: #2e3436; color: #eeeeec; @@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 170px; position: absolute; top: -19px; - left: 15px; + left: 7px; } #nav-floater { position: fixed; @@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: transparent; border-radius: 5px; z-index: 100; - width: 28%; - height: 80px; + width: 300px; + height: 60px; } #nav-buttons { clear: both; list-style: none; padding: 0px; + margin: 0 7px 0 0; height: 25px; } #nav-buttons li { @@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .search-box { display: inline-block; - height: 20px; - margin: 0; - position: relative; - left: 7px; - top: 5px; - /*width: 210px;*/ + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: #1d1f1d; + border-radius: 5px; } #search-text { border: 1px #eec solid; background: #2e3436; color: #eec; } +.search-box #search-text { + margin: 8px; + width: 10em; + color: #eec; +} nav #user-menu { display: block; width: 75%; @@ -529,8 +536,8 @@ nav #user-menu { border-radius: 5px; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; clear: both; - top: 12px; - left: 7px; + top: 4px; + left: 10px; } nav #user-menu-label { font-size: 12px; @@ -641,6 +648,7 @@ nav #user-menu-label { background: #ddd; } + /** sysmsg **/ #sysmsg_info { position: fixed; @@ -752,6 +760,7 @@ aside #viewcontacts { margin: 0px 0px 0px 0px; } + /** * contacts block */ @@ -1018,7 +1027,7 @@ aside #viewcontacts { * section */ section { - margin: 20px 8% 0 4%; + margin: 20px 9% 0 4%; font-size: 0.8em; padding-right: 230px; min-width: 475px; @@ -1057,6 +1066,7 @@ section { text-decoration: none; } + /** * items */ @@ -1129,7 +1139,7 @@ section { border-radius: 5px; } [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { - margin: 0 0 5px 0; + /*margin: 0 0 5px 0;*/ } .wall-item-tools { float: right; @@ -1150,6 +1160,12 @@ section { -ms-transition: all 1s ease-in-out; transition: all 1s ease-in-out; } +.wall-item-subtools1 { + list-style: none; +} +.wall-item-subtools2 { + list-style: none; +} .wall-item-title { font-size: 1.2em; font-weight: bold; @@ -1260,6 +1276,24 @@ section { overflow: auto; width: 100%; } +#connect-services-header { + +} +#connect-services { + margin: 5px 0 0 0; +} +#extra-help-header { + +} +#extra-help { + margin: 5px 0 0 0; +} +#postit-header { + +} +#postit { + margin: 5px 0 0 0; +} /** @@ -2328,7 +2362,7 @@ div[id$="wrapper"] br { .field { /*margin-bottom: 10px;*/ /*padding-bottom: 10px;*/ - /*overflow: auto;*/ + overflow: auto; width: 100%; } .field label, label { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index db8cf5ccd..d451a6b93 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -132,11 +132,13 @@ function dispy_community_info() { $fostitJS = "javascript: (function() { the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' + - encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + - encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? - document.getSelection() : document.selection.createRange().text)); + encodeURIComponent(window.location.href) + '&title=' + + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent('' + (window.getSelection + ? window.getSelection() : document.getSelection + ? document.getSelection() : document.selection.createRange().text)); a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + if ( !window.open(the_url, 'fpostit', 'location=yes, links=no, scrollbars=no, toolbar=no, width=600, height=300') ) { location.href = the_url; } if (/Firefox/.test(navigator.userAgent)) { @@ -144,18 +146,18 @@ function dispy_community_info() { } else { a_funct(); } - })();" ; + })();"; $aside['$fostitJS'] = $fostitJS; $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside'] = replace_macros($tpl, $aside); + $a->page['aside'] .= replace_macros($tpl, $aside); } -//right_aside at profile pages +//aside at profile pages if ($a->argv[0] === "profile") { - // COMMUNITY dispy_community_info(); } + diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index c9ac20c89..4b973bf93 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -15,44 +15,45 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper"> - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - </div> <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.star }} - <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="#" 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 }} - - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> - {{ endif }} - - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} + <ul class="wall-item-subtools1"> + <li class="wall-item-lock-wrapper"> + {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </li> + {{ if $item.star }} + <li> + <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> + </li> + {{ endif }} + {{ if $item.vote }} + <li 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="#" 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;" /> + </li> + {{ endif }} + </ul> + <ul class="wall-item-subtools2"> + {{ if $item.filer }} + <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li> + {{ endif }} + {{ if $item.plink }} + <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li> + {{ endif }} + {{ if $item.edpost }} + <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li> + {{ endif }} + <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id"> + {{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }} + {{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }} + </li> + </ul> <div class="wall-item-delete-end"></div> - </div> <div class="wall-item-content" id="wall-item-content-$item.id" > <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> |