friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #213 from simonlnu/master 

minor dispy* fixes
This commit is contained in:
Simon 2012-04-07 20:47:37 -07:00
parent f931d5c918 01961f7caa
commit e3b2ac0735
7 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/theme/dispy-dark/nav.tpl
View File

@ -56,7 +56,6 @@ works -->
<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a> <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.contacts }} {{ 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> <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 }} {{ endif }}
@ -75,11 +74,9 @@ works -->
{{ if $nav.admin }} {{ if $nav.admin }}
<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li> <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.login }} {{ if $nav.login }}
<li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.logout }} {{ if $nav.logout }}
<li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li> <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
{{ endif }} {{ endif }}

7
view/theme/dispy-dark/style.css
View File

@ -63,8 +63,8 @@ option {
color: #eec; color: #eec;
background: #2e2f2e; background: #2e2f2e;
} }
li { ul, ol {
padding: 0 0 0 2px; padding: 0;
} }
/* remember to define focus styles! */ /* remember to define focus styles! */
:focus { :focus {
@ -2603,7 +2603,8 @@ div[id$="wrapper"] br {
} }
.icon.drop, .icon.drop,
.icon.drophide, .icon.delete { .icon.drophide, .icon.delete {
float: left; float: right;
margin: 5px;
} }
.icon.s22.delete { .icon.s22.delete {
display: block; display: block;

4
view/theme/dispy-dark/theme.php
View File

@ -9,6 +9,10 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a> * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/ */
$a->theme_info = array(
'extends' => 'dispy-dark',
);
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
$(document).ready(function() { $(document).ready(function() {

19
view/theme/dispy-dark/wall_item.tpl
View File

@ -4,9 +4,7 @@
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
</a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -57,15 +55,16 @@
</ul> </ul>
<div class="wall-item-delete-end"></div> <div class="wall-item-delete-end"></div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$item.id" > <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> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
<div class="wall-item-title-end"></div> <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="wall-item-body" id="wall-item-body-$item.id">
<div class="body-tag"> $item.body
{{ for $item.tags as $tag }} <div class="body-tag">
<span class='tag'>$tag</span> {{ for $item.tags as $tag }}
{{ endfor }} <span class='tag'>$tag</span>
</div> {{ endfor }}
</div>
</div> </div>
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">

21
view/theme/dispy-dark/wallwall_item.tpl
View File

@ -2,15 +2,13 @@
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div> </div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
</ul> </ul>
<div class="wall-item-delete-end"></div> <div class="wall-item-delete-end"></div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$item.id" > <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> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
<div class="wall-item-title-end"></div> <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="wall-item-body" id="wall-item-body-$item.id">
<div class="body-tag"> $item.body
{{ for $item.tags as $tag }} <div class="body-tag">
<span class="tag">$tag</span> {{ for $item.tags as $tag }}
{{ endfor }} <span class="tag">$tag</span>
</div> {{ endfor }}
</div>
</div> </div>
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">

7
view/theme/dispy/style.css
View File

@ -63,8 +63,8 @@ option {
color: #222; color: #222;
background: #efefef; background: #efefef;
} }
li { ul, ol {
padding: 0 0 0 2px; padding: 0;
} }
/* remember to define focus styles! */ /* remember to define focus styles! */
:focus { :focus {
@ -2603,7 +2603,8 @@ div[id$="wrapper"] br {
} }
.icon.drop, .icon.drop,
.icon.drophide, .icon.delete { .icon.drophide, .icon.delete {
float: left; float: right;
margin: 5px;
} }
.icon.s22.delete { .icon.s22.delete {
display: block; display: block;

4
view/theme/dispy/theme.php
View File

@ -9,6 +9,10 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a> * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/ */
$a->theme_info = array(
'extends' => 'dispy',
);
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
$(document).ready(function() { $(document).ready(function() {