diff options
Diffstat (limited to 'view/theme')
-rw-r--r-- | view/theme/dispy/search_item.tpl | 17 | ||||
-rw-r--r-- | view/theme/dispy/wall_item.tpl | 37 | ||||
-rw-r--r-- | view/theme/dispy/wallwall_item.tpl | 38 | ||||
-rw-r--r-- | view/theme/duepuntozero/search_item.tpl | 54 | ||||
-rw-r--r-- | view/theme/duepuntozero/wall_item.tpl | 24 | ||||
-rw-r--r-- | view/theme/duepuntozero/wallwall_item.tpl | 24 | ||||
-rw-r--r-- | view/theme/loozah/search_item.tpl | 52 | ||||
-rw-r--r-- | view/theme/loozah/wall_item.tpl | 24 | ||||
-rw-r--r-- | view/theme/loozah/wallwall_item.tpl | 24 | ||||
-rw-r--r-- | view/theme/quattro/icons.less | 2 | ||||
-rw-r--r-- | view/theme/quattro/quattro.less | 46 | ||||
-rw-r--r-- | view/theme/quattro/style.css | 76 | ||||
-rw-r--r-- | view/theme/testbubble/search_item.tpl | 17 | ||||
-rw-r--r-- | view/theme/testbubble/wall_item.tpl | 27 | ||||
-rw-r--r-- | view/theme/testbubble/wallwall_item.tpl | 33 |
15 files changed, 425 insertions, 70 deletions
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl index 39c74ef81..3d841ab08 100644 --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -16,9 +16,16 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $drop + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> @@ -36,5 +43,9 @@ </div> <div class="wall-item-outside-wrapper-end$indent" ></div> - <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div> + <div class="wall-item-conv" id="wall-item-conv-$id" > + {{ if $conv }} + <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a> + {{ endif }} + </div> diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 1f5cbcaeb..f555ed813 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -17,17 +17,34 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - {{ if $star }} - <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> - {{ endif }} - $vote - {{ if $plink }} - <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> - {{ endif }} - $edpost - $drop + {{ if $star }} + <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> + {{ endif }} + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} + {{ if $plink }} + <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> + {{ endif }} + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>' + {{ endif }} + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> <div class="wall-item-content" id="wall-item-content-$id" > diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index add2cd5a0..9e6ea40a1 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -22,17 +22,35 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - {{ if $star }} - <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> - {{ endif }} - $vote - {{ if $plink }} - <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> - {{ endif }} - $edpost - $drop + {{ if $star }} + <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> + {{ endif }} + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} + {{ if $plink }} + <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> + {{ endif }} + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>' + {{ endif }} + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> + </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl new file mode 100644 index 000000000..b4a1c82cb --- /dev/null +++ b/view/theme/duepuntozero/search_item.tpl @@ -0,0 +1,54 @@ +<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" > + <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > + <div class="wall-item-info" id="wall-item-info-$id"> + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" + onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" + onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a> + <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span> + <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id"> + <ul> + $item_photo_menu + </ul> + </div> + </div> + <div class="wall-item-photo-end"></div> + <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + <div class="wall-item-location" id="wall-item-location-$id">$location</div> + </div> + </div> + <div class="wall-item-author"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> + + </div> + <div class="wall-item-content" id="wall-item-content-$id" > + <div class="wall-item-title" id="wall-item-title-$id">$title</div> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-$id" >$body</div> + </div> + <div class="wall-item-tools" id="wall-item-tools-$id"> + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> + </div> + </div> + <div class="wall-item-wrapper-end"></div> + + + <div class="wall-item-conv" id="wall-item-conv-$id" > + {{ if $conv }} + <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a> + {{ endif }} + </div> + +<div class="wall-item-outside-wrapper-end$indent" ></div> + +</div> + + diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index 32820fb7c..d264d3999 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -16,7 +16,8 @@ </div> <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }} + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} <div class="wall-item-location" id="wall-item-location-$id">$location</div> </div> </div> @@ -31,15 +32,30 @@ <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} {{ if $plink }} <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> {{ endif }} - $edpost + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> {{ endif }} - $drop + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> </div> <div class="wall-item-wrapper-end"></div> diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 58d5e16f6..aaa542760 100644 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -21,7 +21,8 @@ </div> <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }} + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} <div class="wall-item-location" id="wall-item-location-$id">$location</div> </div> </div> @@ -35,15 +36,30 @@ <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} {{ if $plink }} <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> {{ endif }} - $edpost + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> {{ endif }} - $drop + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> </div> <div class="wall-item-wrapper-end"></div> diff --git a/view/theme/loozah/search_item.tpl b/view/theme/loozah/search_item.tpl new file mode 100644 index 000000000..17dc6233c --- /dev/null +++ b/view/theme/loozah/search_item.tpl @@ -0,0 +1,52 @@ +<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" > + <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > + <div class="wall-item-info" id="wall-item-info-$id"> + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" + onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" + onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a> + <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span> + <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id"> + <ul> + $item_photo_menu + </ul> + </div> + </div> + <div class="wall-item-photo-end"></div> + <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + <div class="wall-item-location" id="wall-item-location-$id">$location</div> + </div> + </div> + <div class="wall-item-author"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> + + </div> + <div class="wall-item-content" id="wall-item-content-$id" > + <div class="wall-item-title" id="wall-item-title-$id">$title</div> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-$id" >$body</div> + </div> + <div class="wall-item-tools" id="wall-item-tools-$id"> + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> + </div> + </div> + <div class="wall-item-wrapper-end"></div> + + + <div class="wall-item-conv" id="wall-item-conv-$id" > + {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }} + </div> + +<div class="wall-item-outside-wrapper-end$indent" ></div> + +</div> + + diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl index a4508b067..e2b7c9c5a 100644 --- a/view/theme/loozah/wall_item.tpl +++ b/view/theme/loozah/wall_item.tpl @@ -16,7 +16,8 @@ </div> <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - $lock + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} <div class="wall-item-location" id="wall-item-location-$id">$location</div> </div> </div> @@ -31,15 +32,30 @@ <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} {{ if $plink }} <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> {{ endif }} - $edpost + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> {{ endif }} - $drop + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> </div> <div class="wall-item-wrapper-end"></div> diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl index daad6ad14..aaa542760 100644 --- a/view/theme/loozah/wallwall_item.tpl +++ b/view/theme/loozah/wallwall_item.tpl @@ -21,7 +21,8 @@ </div> <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - $lock + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} <div class="wall-item-location" id="wall-item-location-$id">$location</div> </div> </div> @@ -35,15 +36,30 @@ <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} {{ if $plink }} <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> {{ endif }} - $edpost + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> {{ endif }} - $drop + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> </div> <div class="wall-item-wrapper-end"></div> diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index c5dc1937b..525ca48d8 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -44,7 +44,7 @@ } &.s48 { width:48px; height: 48px; - .icons(22); + .icons(48); } diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 95dd61adb..1be65ea91 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -21,10 +21,18 @@ body { -webkit-border-radius: @arguments; border-radius: @arguments; } - .roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } .roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } +.opaque(@v: 0.5){ + opacity: @v; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} + a, a:link { color: @Link; text-decoration: none; } a:visited { color: @LinkVisited; text-decoration: none; } a:hover {color: @LinkHover; text-decoration: underline; } @@ -257,7 +265,7 @@ section { /* wall item */ .tread-wrapper { - background-color: @ThreadBackgroundColor; + background-color: @ThreadBackgroundColor; position: relative; padding: 10px; margin-bottom: 20px; @@ -268,7 +276,6 @@ section { .wall-item-container { display: table; width: 780px; - margin-bottom: 10px; .wall-item-item, .wall-item-bottom { display: table-row; } @@ -290,22 +297,51 @@ section { .wall-item-photo-menu { display: none; } } + .wall-item-location { + word-wrap: break-word; + width: 50px; + } .wall-item-content { display: table-cell; - font-size: 12px; + font-size: 16px; max-width: 720px; word-wrap: break-word; } .wall-item-content img { max-width: 710px; } .wall-item-links, - .wall-item-actions { display: table-cell; } + .wall-item-actions { + display: table-cell; + vertical-align: middle; + + .icon { + .opaque(0.5); + } + .icon:hover { + .opaque(1.0); + } + } .wall-item-ago { padding-right: 40px; } + .wall-item-name { font-weight: bold; } + + .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; } + .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em; + a { margin-right: 3em; } + } + .wall-item-actions-tools { float: right; width: 25%; + a { float: right; } + input { float: right; } + } } + + + .wall-item-container.comment { + margin-top: 50px; .wall-item-photo { width: 32px; height: 32px; margin-left: 16px;} .wall-item-photo-menu-button { top: 13px !important; left: 10px !important; } + .wall-item-links { padding-left: 12px; } } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index ad50ee327..4d9e12540 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -121,34 +121,34 @@ height: 48px; } .icon.s48.notify { - background-image: url("../../../images/icons/22/notify_off.png"); + background-image: url("../../../images/icons/48/notify_off.png"); } .icon.s48.gear { - background-image: url("../../../images/icons/22/gear.png"); + background-image: url("../../../images/icons/48/gear.png"); } .icon.s48.add { - background-image: url("../../../images/icons/22/add.png"); + background-image: url("../../../images/icons/48/add.png"); } .icon.s48.delete { - background-image: url("../../../images/icons/22/delete.png"); + background-image: url("../../../images/icons/48/delete.png"); } .icon.s48.edit { - background-image: url("../../../images/icons/22/edit.png"); + background-image: url("../../../images/icons/48/edit.png"); } .icon.s48.star { - background-image: url("../../../images/icons/22/star.png"); + background-image: url("../../../images/icons/48/star.png"); } .icon.s48.menu { - background-image: url("../../../images/icons/22/menu.png"); + background-image: url("../../../images/icons/48/menu.png"); } .icon.s48.link { - background-image: url("../../../images/icons/22/link.png"); + background-image: url("../../../images/icons/48/link.png"); } .icon.s48.lock { - background-image: url("../../../images/icons/22/lock.png"); + background-image: url("../../../images/icons/48/lock.png"); } .icon.s48.unlock { - background-image: url("../../../images/icons/22/unlock.png"); + background-image: url("../../../images/icons/48/unlock.png"); } /* global */ body { @@ -507,7 +507,6 @@ section { .wall-item-container { display: table; width: 780px; - margin-bottom: 10px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; @@ -534,9 +533,13 @@ section { .wall-item-container .wall-item-info .wall-item-photo-menu { display: none; } +.wall-item-container .wall-item-location { + word-wrap: break-word; + width: 50px; +} .wall-item-container .wall-item-content { display: table-cell; - font-size: 12px; + font-size: 16px; max-width: 720px; word-wrap: break-word; } @@ -545,10 +548,56 @@ section { } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-ago { padding-right: 40px; } +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + float: left; + width: 25%; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social { + float: left; + width: 50%; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 3em; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 25%; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 50px; +} .wall-item-container.comment .wall-item-photo { width: 32px; height: 32px; @@ -558,3 +607,6 @@ section { top: 13px !important; left: 10px !important; } +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl index 76fbee6ba..7e5bfbe71 100644 --- a/view/theme/testbubble/search_item.tpl +++ b/view/theme/testbubble/search_item.tpl @@ -16,9 +16,16 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $drop + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> @@ -32,8 +39,10 @@ </div> </div> - <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div> + <div class="wall-item-conv" id="wall-item-conv-$id" > + {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }} + </div> <div class="wall-item-wrapper-end"></div> </div> -<div class="wall-item-outside-wrapper-end$indent" ></div>
\ No newline at end of file +<div class="wall-item-outside-wrapper-end$indent" ></div> diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 47f062aff..70ec00dd9 100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -18,7 +18,10 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title-end"></div> @@ -26,16 +29,32 @@ </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} {{ if $plink }} <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> {{ endif }} - $edpost + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> {{ endif }} - $drop + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> + + </div> <div class="wall-item-author"> diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index 4fe677ab4..8819103a3 100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -22,12 +22,35 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper">$lock</div> + <div class="wall-item-lock-wrapper"> + {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <div class="wall-item-tools" id="wall-item-tools-$id"> - $vote - $plink - $edpost - $drop + {{ if $vote }} + <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a> + {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }} + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + {{ endif }} + {{ if $plink }} + <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div> + {{ endif }} + {{ if $edpost }} + <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + + {{ if $star }} + <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> + {{ endif }} + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > + {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + </div> + {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }} + <div class="wall-item-delete-end"></div> </div> <div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-title" id="wall-item-title-$id">$title</div> |