diff options
Diffstat (limited to 'view')
-rw-r--r-- | view/theme/dispy-dark/nav.tpl | 3 | ||||
-rw-r--r-- | view/theme/dispy-dark/style.css | 7 | ||||
-rw-r--r-- | view/theme/dispy-dark/theme.php | 4 | ||||
-rw-r--r-- | view/theme/dispy-dark/wall_item.tpl | 19 | ||||
-rw-r--r-- | view/theme/dispy-dark/wallwall_item.tpl | 21 | ||||
-rw-r--r-- | view/theme/dispy/style.css | 7 | ||||
-rw-r--r-- | view/theme/dispy/theme.php | 4 |
7 files changed, 35 insertions, 30 deletions
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index e38b2bbe2..34aba50de 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -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> </li> {{ 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 }} @@ -75,11 +74,9 @@ works --> {{ 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> {{ endif }} - {{ 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> {{ endif }} - {{ 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> {{ endif }} diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 30d5cb8a9..a3248c13c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -63,8 +63,8 @@ option { color: #eec; background: #2e2f2e; } -li { - padding: 0 0 0 2px; +ul, ol { + padding: 0; } /* remember to define focus styles! */ :focus { @@ -2603,7 +2603,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: left; + float: right; + margin: 5px; } .icon.s22.delete { display: block; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 17d31feda..e1dc8ba0c 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -9,6 +9,10 @@ * Screenshot: <a href="screenshot.jpg">Screenshot</a> */ +$a->theme_info = array( + 'extends' => 'dispy-dark', +); + $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index 8acaeaf02..52af07532 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -4,9 +4,7 @@ <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')" 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"> - <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> + <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> <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"> <ul> @@ -57,15 +55,16 @@ </ul> <div class="wall-item-delete-end"></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-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> + <div class="wall-item-body" id="wall-item-body-$item.id"> + $item.body + <div class="body-tag"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> </div> </div> <div class="wall-item-author"> diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl index 421cddadf..e8cbc2cd4 100644 --- a/view/theme/dispy-dark/wallwall_item.tpl +++ b/view/theme/dispy-dark/wallwall_item.tpl @@ -2,15 +2,13 @@ <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-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"> - <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> + <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> </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" 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)"> - <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> + <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> <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"> <ul> @@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick </ul> <div class="wall-item-delete-end"></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-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class="tag">$tag</span> - {{ endfor }} - </div> + <div class="wall-item-body" id="wall-item-body-$item.id"> + $item.body + <div class="body-tag"> + {{ for $item.tags as $tag }} + <span class="tag">$tag</span> + {{ endfor }} + </div> </div> </div> <div class="wall-item-author"> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index f8287c6ec..622cf5734 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -63,8 +63,8 @@ option { color: #222; background: #efefef; } -li { - padding: 0 0 0 2px; +ul, ol { + padding: 0; } /* remember to define focus styles! */ :focus { @@ -2603,7 +2603,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: left; + float: right; + margin: 5px; } .icon.s22.delete { display: block; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index f3c54caf9..d0f6797cb 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -9,6 +9,10 @@ * Screenshot: <a href="screenshot.jpg">Screenshot</a> */ +$a->theme_info = array( + 'extends' => 'dispy', +); + $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { |